projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3c77cc3
a515169
)
* src/image.c: Add cast to fix type clash
author
Paul Eggert
<eggert@cs.ucla.edu>
Sun, 23 Jan 2011 04:34:48 +0000
(20:34 -0800)
committer
Paul Eggert
<eggert@cs.ucla.edu>
Sun, 23 Jan 2011 04:34:48 +0000
(20:34 -0800)
1
2
src/ChangeLog
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/ChangeLog
index 0c383f2e71ff45d111e1c1ad371c5e3b034a02e3,7850d191c20fb42e5665d5af55adc70dd3c6bb12..d1fcc4ebb1e7e0efc552550d181f940c7b3f116a
---
1
/
src/ChangeLog
---
2
/
src/ChangeLog
+++ b/
src/ChangeLog
@@@
-1,5
-1,8
+1,8
@@@
2011-01-23 Paul Eggert <eggert@cs.ucla.edu>
- * image.c (x_create_bitmap_from_xpm_data): Add cast to fix type clash
++ * image.c (x_create_bitmap_from_xpm_data): Add cast to fix type clash
+ when calling XpmCreatePixmapFromData.
+
Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
* lisp.h (SSDATA): New macro.
All uses of (char *) SDATA (x) replaced with SSDATA (x),